merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 29 Aug 2006 14:28:38 +0000 (08:28 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 29 Aug 2006 14:28:38 +0000 (08:28 -0600)

Trivial merge